diff --git a/device-common.mk b/device-common.mk
index 5d38628..7e0d09a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -75,7 +75,6 @@
     android.hardware.audio@4.0-impl:32 \
     android.hardware.audio.effect@4.0-impl:32 \
     android.hardware.audio@2.0-service \
-    android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl \
     android.hardware.bluetooth.audio@2.0-impl
 
@@ -85,8 +84,6 @@
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service
 
-PRODUCT_PACKAGES += libGLES_android
-
 # Graphics HAL
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
diff --git a/init.common.rc b/init.common.rc
index 53f446c..1ae164b 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -109,8 +109,7 @@
     oneshot
     seclabel u:r:watchdogd:s0
 
-service bugreport /system/bin/dumpstate -d -p -B -z \
-    -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
+service bugreport /system/bin/dumpstate -d -p -z
     class main
     disabled
     oneshot
diff --git a/manifest.xml b/manifest.xml
index 63c1e9f..e60aa9c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -148,24 +148,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>
         <version>1.0</version>